bitkeeper revision 1.1236.12.29 (422faec9cZXX4zIVbvTV30eJRoDSwQ)

A recent change to the privop driver broke the 2.4 build, this patch
fixes it by pulling in a new macro from 2.6's page.h.

Signed-off-by: <mark.williamson@cl.cam.ac.uk>

diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/page.h b/linux-2.4.29-xen-sparse/include/asm-xen/page.h
index 78863c36daa7ec9cbbec54be9b3b7e10d07d76e8..fbab7f5ff1b926c207361fbff9db574e003c2e90 100644 (file)
--- a/linux-2.4.29-xen-sparse/include/asm-xen/page.h
+++ b/linux-2.4.29-xen-sparse/include/asm-xen/page.h
@@ -88,6 +88,7 @@ static inline unsigned long pmd_val(pmd_t x)
     if ( (ret & 1) ) ret = machine_to_phys(ret);
     return ret;
 }
+#define pmd_val_ma(x)   ((x).pmd)
 #define pgd_val(x)     ({ BUG(); (unsigned long)0; })
 #define pgprot_val(x)  ((x).pgprot)